xsm: Fix linker script integration for xsm initcall list.

Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/arch/x86/x86_32/xen.lds.S b/xen/arch/x86/x86_32/xen.lds.S
index 08649f931ba385e4d48ca339be02730efa2016e9..7641867f68db99f742722160be05f13ac2e2cb54 100644 (file)
--- a/xen/arch/x86/x86_32/xen.lds.S
+++ b/xen/arch/x86/x86_32/xen.lds.S
@@ -63,8 +63,9 @@ SECTIONS
   __initcall_start = .;
   .initcall.init : { *(.initcall1.init) } :text
   __initcall_end = .;
-   .xsm_initcall.init : { __xsm_initcall_start = .; 
-   *(.xsm_initcall.init) __xsm_initcall_end = .; }
+  __xsm_initcall_start = .; 
+  .xsm_initcall.init : { *(.xsm_initcall.init) } :text
+  __xsm_initcall_end = .;
   . = ALIGN(PAGE_SIZE);
   __init_end = .;
 

diff --git a/xen/arch/x86/x86_64/xen.lds.S b/xen/arch/x86/x86_64/xen.lds.S
index 4ff12a01c2edc968de31f50908579e863ee34c4a..8dd5a41cb798ed25f51c504eb1b9e4ff24c73ab0 100644 (file)
--- a/xen/arch/x86/x86_64/xen.lds.S
+++ b/xen/arch/x86/x86_64/xen.lds.S
@@ -61,6 +61,9 @@ SECTIONS
   __initcall_start = .;
   .initcall.init : { *(.initcall1.init) } :text
   __initcall_end = .;
+  __xsm_initcall_start = .; 
+  .xsm_initcall.init : { *(.xsm_initcall.init) } :text
+  __xsm_initcall_end = .;
   . = ALIGN(PAGE_SIZE);
   __init_end = .;